Fix a crash with steppers
authorMatthias Clasen <mclasen@redhat.com>
Thu, 5 Nov 2015 14:41:10 +0000 (09:41 -0500)
committerMatthias Clasen <mclasen@redhat.com>
Thu, 5 Nov 2015 14:44:14 +0000 (09:44 -0500)
The introduction of the trough node was not properly carried
into the code constructing stepper nodes, and was causing
assertion failures there. This was only showing up on Windows,
since Adwaita and HighContrast don't have steppers.

gtk/gtkrange.c

index cae85924b1e1f2f0c3c30b4d80a518013310bf6f..dd26dcf777490c01653af0faea2773f0740eaea0 100644 (file)
@@ -4264,7 +4264,7 @@ _gtk_range_set_steppers (GtkRange *range,
         {
           priv->stepper_a_node = create_stepper_node (range,
                                                       "down",
-                                                      priv->has_stepper_b ? priv->stepper_b_node : priv->slider_node,
+                                                      priv->has_stepper_b ? priv->stepper_b_node : priv->trough_node,
                                                       NULL);
         }
       else
@@ -4281,7 +4281,7 @@ _gtk_range_set_steppers (GtkRange *range,
         {
           priv->stepper_b_node = create_stepper_node (range,
                                                       "up",
-                                                      priv->slider_node,
+                                                      priv->trough_node,
                                                       NULL);
         }
       else
@@ -4299,7 +4299,7 @@ _gtk_range_set_steppers (GtkRange *range,
           priv->stepper_c_node = create_stepper_node (range,
                                                       "down",
                                                       NULL,
-                                                      priv->slider_node);
+                                                      priv->trough_node);
         }
       else
         {
@@ -4316,7 +4316,7 @@ _gtk_range_set_steppers (GtkRange *range,
           priv->stepper_d_node = create_stepper_node (range,
                                                       "up",
                                                       NULL,
-                                                      priv->has_stepper_c ? priv->stepper_c_node : priv->slider_node);
+                                                      priv->has_stepper_c ? priv->stepper_c_node : priv->trough_node);
         }
       else
         {